merge trunk

diff --cc src/ChangeLog
index ab8fc5b47cc28d98e856a31a060e2e56615058b7,563b20bdea3569989debfa07a4a3b6a33272e70a..e58ee352582d4a1aa0ec07ea580a56dade6905ee
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,9 -1,14 +1,20 @@@
 +2013-03-20  Kenichi Handa  <handa@gnu.org>
 +
 +      * coding.c (syms_of_coding): Initialize disable_ascii_optimization
 +      to 1 (temporary workaround until a bug related to ASCII
 +      optimization is fixed).
 +
+ 2013-03-19  Dmitry Antipov  <dmantipov@yandex.ru>
+ 
+       * window.c (Fwindow_combination_limit, Fset_window_combination_limit):
+       Signal error if window is not internal.  Adjust docstring.
+       (delete_all_child_windows): Use combination_limit to save the buffer.
+       (Fset_window_configuration): Adjust accordingly.
+       * print.c (syms_of_print): Initialize debugging output not here...
+       (init_print_once): ...but in a new function here.
+       * lisp.h (init_print_once): Add prototype.
+       * emacs.c (main): Add call to init_print_once.  Adjust comments.
+ 
  2013-03-18  Dmitry Antipov  <dmantipov@yandex.ru>
  
        * window.c (window_resize_check, window_resize_apply)

diff --cc src/coding.c
Simple merge